* lisp/man.el (Man-completion-table): Let the user type "-k ".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39b0ef8cf7fcb2ad79107b81391ff563693f57fc..6993f10fbc38366368e31350de23e05b90f8da55 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * man.el (Man-completion-table): Let the user type "-k " (bug#6319).
+
 2010-05-31  Drew Adams  <drew.adams@oracle.com>
 
        * files.el (directory-files-no-dot-files-regexp): Doc fix (bug#6298).
@@ -12,14 +16,13 @@
        * ansi-color.el: Delete unused escape sequences (Bug#6085).
        (ansi-color-drop-regexp): New constant.
        (ansi-color-apply, ansi-color-filter-region)
-       (ansi-color-apply-on-region): Delete unrecognized control
-       sequences.
+       (ansi-color-apply-on-region): Delete unrecognized control sequences.
        (ansi-color-apply): Build string list before calling concat.
 
 2010-05-27  Chong Yidong  <cyd@stupidchicken.com>
 
-       * progmodes/verilog-mode.el (verilog-type-font-keywords): Use
-       font-lock-constant-face, not obsolete font-lock-reference-face.
+       * progmodes/verilog-mode.el (verilog-type-font-keywords):
+       Use font-lock-constant-face, not obsolete font-lock-reference-face.
 
 2010-05-27  Masatake YAMATO  <yamato@redhat.com>
 

diff --git a/lisp/man.el b/lisp/man.el
index 8eb5f73e2450c9d7d960fee8469f47b807f18e85..658c1ebbcef6955c8a906e69ee9397154bec0f45 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -754,6 +754,9 @@ POS defaults to `point'."
   (cond
    ((eq action 'lambda)
     (not (string-match "([^)]*\\'" string)))
+   ((equal string "-k")
+    ;; Let SPC (minibuffer-complete-word) insert the space.
+    (complete-with-action action '("-k ") string pred))
    (t
     (let ((table (cdr Man-completion-cache))
           (section nil)